From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 2 Jun 2018 22:25:31 +0000 (+0200)
Subject: tests: Fix locale detection
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~23^2~6
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f200efdb8ae7189e8e50e2e934bfaad3f14eaa9b;p=ostree.git

tests: Fix locale detection

When a locale with C.utf8 in its name (e.g. es_EC.utf8) was installed
on a system, the C.utf8 locale was chosen, even when it was not available.

This patch fixes the grep pattern to match whole lines returned by locale -a.

See: #1592

Closes: #1611
Approved by: cgwalters
---

diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh
index 6991a86d..f6f94288 100644
--- a/tests/libtest-core.sh
+++ b/tests/libtest-core.sh
@@ -37,9 +37,9 @@ assert_not_reached () {
 # Some tests look for specific English strings. Use a UTF-8 version
 # of the C (POSIX) locale if we have one, or fall back to POSIX
 # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8)
-if locale -a | grep C.UTF-8 >/dev/null; then
+if locale -a | grep '^C.UTF-8$' >/dev/null; then
     export LC_ALL=C.UTF-8
-elif locale -a | grep C.utf8 >/dev/null; then
+elif locale -a | grep '^C.utf8$' >/dev/null; then
     export LC_ALL=C.utf8
 else
     export LC_ALL=C